minor updates to work with latest versions