Fixes #133 - Improper wrapping of ConfigurationBuilder types. Some other minor fixes.