make sure we do bittoll before nginx
Final lint cleanups