Fixes for opentsdb, (broken during 1.8 development)