Fixes

Warnings, Global Issues