Help prevent fixed headers from miscalculating
Also includes a couple package bundling errors for ender