A few /usr related fixes

Nothing very significant here.