Bug 916918 - Couple of issues with frontend calls.