Minor additions to handling input