More Device/Ipblock fixes.