MDE-3 NPE fixes, add x and y labels to axes.