Minor changes before 1.1

@peter-budo