fix some problems with raw-body and system differences