Fixes to work with the default update function.