I'd like the two exposing possible attack vectors at least replaced. Everything else is bonus but wouldn't do any harm.