Misc changes

Some changes I needed to export a 'pod