* Fixed some Linux issues