multiple updates to fix linux issue