Fix some really silly mistakes and static-ize variables

Sponsored-by: EMC / Isilon Storage Division