Trying to fix some stuff.