Fixed Entity Type bugs.