more scattered fixes