Try fixing stuff a little