ZAch's fixes