Changed by Bilen - Fixing some build bugs