Fixes in, test errors