A few build fixes