Warning fixxes