Tweak legacy server comments and imports