Fix up Docker/Make file issues
Allow change of listen addr/port