- Fixed more out of bounds issues.