Little bugs fixed