BZ-99999 Fix build errors (why don't these show up in dev?)