Fixes for internal sensors