add temp fix for server errors and bugs