Resolve smokey test failures