More minor fixes for stripping