some fixes to system