Build and install fixes.