few fixes for heterodyne system