Fixing init security issue, etc