Misc changes to bundles
Move hacks to a new section