small fixes to get the current version working

Mmmm ... weird. The first one is fine on 2.1. Will have to check pre-2.0 git versions.