Fix Velocity Tools