Type fixes
Type changes