Some fixxes