BZ-99999 fix build errors (which don't show up locally anymore,
arghhhhh)