Fixing up unnecessary mistakes