Update to actually build correctly