Fixes and testing.