Incorporate suggestions by Cosmin.