Few more small fixes