Fixup return type in handlers