Updates to pass CI build