Fixes for update system