Minor bug tweaks for layout issues.