Review fixes, using some points from the floating ip reviews