Few small changes related to possible derefencing? [#75]