Coursio/App#1764 some minor stuff