Improved compatibility with thesisgenerator