Insider Threat: Updated fixes for small bugs

Updated fixes for small bugs