Switching to ISO function names
Suppressed unwanted warnings