Issue 141 & 139

Fixes related to epobc