Finish security enhancements