Small fixes

To break the ice ;) More to come.