Fixing some bugs that were leftover from build script setup