Small fixes and clean up after testing refactored IPN code