Done with first round of fixes from module review by security team