Tiny fixes, and good to go