Fixed problem types(stack overflow)
riftwarp adjusted to simplified common lib