O3 fixups thicklizard