Add some fix on Devices creation.