Support AppleWebApp and small fix