Fix some bluring of responsibilitied