Small fixes for version 1.6.5