Hopefully fixed some things