Vanilla Friendly Fixes