Bug Fixes:
Minor bug fixes