Small fixes based on the To-do list