Fixes and fixes