More stub impl and compile fixes.