Fixing a couple of issue preventing build from working