Some minor bugs ...