Quick cleanup that was causing buffer overflow in Ubuntu 12.04