Updates for added Linux compatibility