Some more small fixe