Fix first time build