Resolve unchecked assignments warnings