Fixes to build and process