Fixes and reverts of master merge