Fixed configuration issue

A few fixes to make this class actually "out of the git".