Minor fixes/improvements