Fix Errors FTW 2