Fixes from our pairing session