Improved splat handling