Fixes for dealing with captions better.