Minor tweaks and Pocfile