scattered fixes and hides