Some bug fixes for sast