couple more issues fix with infinality