Strict fixes for stripe