More fixes/improvements