Small changes

Created by: rspeicher

See commits.

合并请求报告