Bug fixes/minor changes, v3.91