More minor updates and fixes