fix intern issues