Fixes for localhost and live, clean.