fixed some issues in fixtures