Some Warning Fix (Thanks to Christopher)