Gatewayd Install fixes

These changes will make it much easier for downstream packagers