Bug Fixes with adapter and measuring.