Fixes a handfull of minor issues