Updates to get working in prod, minor style change