Code

Corrected some defines and the handling of `io_master_port'.