first warnings fixed