Quick fixes for changes from the recent updates to mantisbt and merge issues.