trims/fixes for 4.3