POC fixes

fixed offline