Quirks changes to PoC