Cumulative fixes
Version 0.6.6