Minor changes and bug fix in composite