Some fixes from todo list