patched files that were having dependency errors