Some quick fixes and small amelioration