Hardening measures

Perform the following hardening measures: