Fixing some minor problems