general fixes to bundle files