Misc Updates to security and validation