Resolved bugs by testing.