Fix various old issues