Solved the Type problems.