Hopefully fixing a few things