Quick fixes for small problems