Tweaks and fixes during hardware testing