Small fixes, improvements.
Merge branch '3.0a' into 3.0
Cleanup.