Some cleanup and properly handled new types