Removed some spurious warnings