Cleaned up some old bugs in oscar.