Fix invokeFixturesDraw and other small changes