Fixes with types