More POC fixes and features