misc fixes, ticket 100