Fixes for insert/update mixed transactions and IDE corrections