Small build fixes