Fixes BugHerd #58 - I think we need to increase the header sizes for these