Fixes for pi installation