Minor changes to previous commit (merge bugs)