Few small updates, fixes here and there