Fixes for Org and the running script for linux