Clearing up some issues