Some warnigs fixed