Some small changes that may help with stability