Fix couple issues regarding wp types