strict fixes