Small BUGs Fix