Clean up some compiler warnings with Stop_Return