Fixing some minor issues