Sync everything with v0.4.1