Fix various files