Cleaned up some Runtime errors