Classic compatiblity.

Fixes #8
Misc fixes.