Cleaned up auto server start a little