Closed out some issues