Bug Fixes - 1

Some minor bug fixes