Fixed errors from github comments