Fixed stuff James broke