Deal with -fPIC better