unrelated small fixes (excluding router/template refactor)