miscellaneous fix

miscellaneous fix