2.6.11-hotfix

Peter Wen
Peter Wen

Smaller fixes, including some for Lacerte import.