BUGs Fixed