Adding saner port declarations