Fix gateway and add bootproto