Some fixes and fixes