Hopefully fixed some stuff