Fixes found by customer.