Fix unchecked type warnings