Small fixes and improvements to Director. I could refactor this already, but I don't feel like it.