Fixes to variations module