Mercury bug fixes. Mercury is Linux and therefore case-sensitive