Fixes after customer test