Fixes, testing