Multiple minor updates and bug fixes