clean ups to fix some of the mock errors and warnings