Cheap fix for two common faults