Fixes that merge removed/changed