fixes to prepare codebase for 3.0