Fixes

No new features, just various bug fixes