Four sonars fix

fixes #2