Migrate to 0.13, modernize