PROV-614 Fixed various minor bugs