Fix some shenanigans with automation and add some of the new ports...