Fixes and testing