More deviceReady changes.

Hopefully it works this time!