More such fixes