Removed 500 warnings