fixups for large devices

Change-Id: I7f7265ef906cb00557a4ab4739c7a82a0d9903ec