Bug Fixes for 4.4