Fixes to sync up with master