Fixes for 4.4.3