Fixes after @dbu's feedbacks