Update main with all the basic security fixes