Fix strict variables