Fixed some unchecked warnings