Adding fixes for file addition/deletion/etc