Fixed merged script errors. Updated meta files.