minor improvements to data getters