Some more questionable changes