Numeric build type
Minor fixes