Fixes a few things