Medical System tweaks