Minor fixes, using latest Zephir