Fixed up paths and added system-fix