various snag fixes