Make strict and warnings compliant