Minor fixes and updates

Minor fixes and updates