Fixes for single repo sites