Fixed more minor issues