Fix minor flaws for release