Fix warnings for MRY