vm::atomic update, small fixes