General fixes that will help with stability