Update the version
Fix invalid return values