2.6.11-hotfix

by Peter Wen

Smaller fixes, including some for Lacerte import.