Cleaning up some issues