Int casts removed, typo fixed