This should fix some stuff