some ffixes