WallPainter: Minor updates