Making a few small fixes to last commit