Fixes for Version 4.4