Minor tweaks and fixes for production