Minor commits before merge to public