minor updates and fixes to work with latest Julia