various compilation-time definitions fixed