Sanitization updates and minor bug fixes