Frabric bugs fixed