Major Apam sonar issues fixed