Minor improvements and cleanup for release 1.0.8