Minor update

Some error fixes and replaced Int64 with Int