Some small Fixxes