Fix some conflicting types of variables