Hopefully fixing some stuff