Cleaned up some errors