fixed codebase for 4.3 changes