Small changes for security. Need to go on SSL