Minor bug fixes and updates

New in this release

• Minor bug fixes and updates