Making small fixes