Some small fixes to get tests not failing