More about fixes