More shadow fixes