Feature minor fixes