Some quick fixes to improve quality