Basic corrections for PoC