Fixed Debug build issues