Fixing some stuff which got messed up