Adding a few types that got removed prematurely
More obsoleted a few fixes based on code reviews by john and simon