Attempt to fix two issues that can break compilation.