some changes necessary to make various packages work together