Minor fixes to pass tests