Some device specific changes made. (May _NOT_ be correct!!!)