Minor fixes for pkg-config usage