Cleaned up some issues