small fixes to dereferencability