Redoes fixes for problems reintroduced by merge