port consistency

Mr. @jbonacci , r?