Fixes to system files