Base: Improve support for 1.8.3 devices