fixture related fixes