Tiny tweaks for better compilation.