small scattered fixes