Minor fixes; Up to v1.0.4