+ Fix some tolerance issues