Minor fixes to argument types to add more specific enums and fix some interface types