Splotch

Separable compilation modifications