Fixing stuff already