Update fixes

Fixes for update from 1.2