Fix miscellaneous two column mode features
