adding back some build fixes
cleanup tablet branch