Fara1.0 qa

Pulling some qa fixes