Fixed Port issues