Small improvements and tidying up - deferred slave port setting