Just fixed stuff