Bug fixes for local source (no App)