Strict fixes