* Some more wonderful helper fixes