And some more build fixes...