Fixes in accordance to -Wall