More fixes for new Nette