Some autoend fixes