Fixes for version 4.2