Sanitize more

This code has not been tested.