Port and host fixes