fixes some parts for support of variations