miscellaneous cleanup to jcsullins build