ip: Some fixes