Small corrections from beta-test

[shariboodts]

(to be completed from Ger's file at a later date - this issue just to not forget)