Fixed bugs with current device creation.