check in a coupe of fixes