fixes for local