Fixed errors, clean build