Further update fixes