Warnigs fixed