Improvements to fab file
Further fixes to fabric scripts