Added hacks for linux development