Fix compiler errors

Whoops. Last-second changes require testing too, it seems.