Fixing a few issues that popped up in 2. …

Fixing a few issues that popped up in 2.6. Planning 2.7 features.