small fixes to measurement classes