Changed some more stuff to reflect 2.0 conventions