Some minor additions and fixes