Div. small fixes requested by Statoil