Various fixes after testing with @Git
Release v0.91