Some updates from #303