More fixes that won't break build