Minor additions to local