Fixes and updates to match master