fixed some files that broke during last merge