Fixes for site launch