Warnings and LOGs fixed