Fixes for 4.3