DHrpcs3 Fixes for last commit