More morphology improvements