Fix reported bugs on DFRPG