Doing some small fixes