FIX: Unify subprocess calls