Fixed some of Julio's problems