Security fixes ID 5 and 6