Fixes for new update mechanism