Moved warning comments to where they make sense