Fix mistakes pointed by @elazar