Fixes for variant API