Bug fixes and new features from MGL1407