Fixes for localhost