Fixes after testing cleanup routine.