Made a few more changes to get sanitization working