Fixes for 4.5