Finished fixing stuff