First bunch of small updates