some fixes to new features introduced before