Some fixes after trying it in the package