Workaround for #273 + more release-prep