Minor changes based on intial sast testing