#320 fixes for ELB

- Resolves #320