Cleanup a bit and fix crash due to too large Q value.