Fixed minor glitches due to recent update 4.2.9.1