BUGFIX fixes for constants