Fixes for update 1.4