Fixed all files that were corrupted during last merge with model branch