Removed a lot of build errors