Small fixxes