Fixed a couple of build issues related to not initialising constants.