Add hacks to prevent stripping