Upgrade to 1.1.0, some small fixes