Export both minimised and non minimised copies
Fix values getting defined in global scope