Add STRICT to some functions