Fix for tolerance table and couple other small fixes