more comilation-related changes