Fixes requested by ArnaudBienner.