Sequrity fixes