More Max fixes.