Warnings fix attempt