Updated to fix warnings