More patches to follow v1.0.1.