Minor additions to fix, pushing