Small fixes

Marco

To make your life easier you find here the two uncontested fixes.