Fixing bugs after testing.