A few bugfixes in measurement and feature controllers
Follow-up fixes