Fix strict variables issues