Fixes merge bugz

Pre-squash