some fixes for the new system