few small fixes

Note, this should be the same in this case