fix some bugs in fab stuff