New Device fixes