Final bug fixes in preparation for release of 1.1