Upgrade to v0.4.1; Minor fixes