Fix strict standard conformance