Fixes from customer