Quick fixes too