fixed constant declaration issues