Small fixes and fixes