Adding some small fixes