Patient object fixes