Minor fixes to update to new versions