some fixes for the running machine