More fixes/testing