Smoke and fuel pumps, tanks