Warning and Error-fixes