Some cleanup before packaging