many fixes for clock owner types - victims of 1.8>1.9 + misc improvements