Few fixes around