Compile fixes & fix 0 app count