Updates to enable proper build