emergency fixes?