Fixed minor inconsistencies