Samsung unload

Fixed issues found whilst testing #171 on device.