Fixing the errors that were popping up