Small fixes/improvements