N24: fixes