back ported bug fixes found during 2014.03 testing