commit some fixes about BaseClasses works with trunk code again, it may
be fixed against later