Update some recent bugs from second review