More Device-Ipblock fixes.