Minor additions and fixes