few fixes after 1rst try of real deployment