Fixing semantic warning flags