Fixed some leftovers from the beginning of port