#44. Fix minor mistakes