Warning Fixes