Some changes necessary to get things working on linux.



Let me know if I can clean these commits up any.