Fix some c&p induced problems.