Some quick fixes for the latest version