Handfull of fixes