Fix for possible warnings