Updated to use fixed repositories