Warning/Error Fixes