Fixed bunch of stuff