F-Race Fixes

Signed-off-by: Bennie Leonard <bennie.leonard@gmail.com>