Reset fixes
Type param fixes