More fixes/etc