Small fixes for mock objects
Fix one last error