Fixed linux build (rebase remnants)