Fix generator for constants