Minor fixes to remove errors