Clean up some issues