few bug fixes for constants