Some small fixes for the last commit