perfs fixes, missing functions