Fixes for latest master