Updates to match Fleck repository