#326 merge in @DamonOehlman tweaks (temporary)