final build fixes