Fix bugs that @nschonni found in his grunt update.