Little bugs are fixed