Fixes in all files