Fixed more yellow Warnings