Some ceilometer fixes