Fixed errors from initial commit