Casual bug-fixing from TODO-LIST