Minor edge-case updates