Minor fixes (this is now v1.0.0 by the way)