Few small fixes I forgot last commit