CS & composer fixes