Fixes

Modified original scripts cause... many errors.