Fixes according to the feedback