Fixing some typing bugs
Works with V3!