Fixes for vendor scripts