fixes for freedoko & postr (incomplete)