Fix some of Peter's suggestions for the Nokia IP530.