Fixed fpdo leftovers