Updates to get CI rolling