Bug Fixes:
Minor bug fixes and improvements.