Fixing errors after merge