Updates for better compatibility with janky setups.