Craig - build fixes