Fix error messages and remove broken preference