Minor optimizations, version bump