Removed type warnings