More bug fixing in FAST