Minor changes for GH-78 and GH-79