Fix bundle generation