Misc tweaking to prepare for deployment