Small improvements around apikit dsl usability