DVD won't render with chapters

The aforementioned fixes are included in v1.5.4 b5495.