MORE bug fixes