Bug Fixes

A number of bug fixes have been included in this release