Make some progress on fixing splatting