few build fixes