Fixed Setup to match latest git changes.