Fixed some issues with building and registering devices.