Some quick hacks