Fabs fixes

Some bug fixes and polish...