small tweaks to get production ready