A few more shadow fixes.