Bug fixes + easier wrapping of constants