Fixed more build issues