fixes in all