Changes to port to 4.4.2