Some fixes and defined type names