Further fixes, something didn't get added