More crankshaft related fixes