Fixed bunch of things on traits