Misc Project Fixes

Fix for two bugs:
* DSC-189, DSC-186