Minor fixes after testing with the device