Small fixes around