#881 Small improvements