Linux

Changes to make things nice on linux