Fixed two warnings as per mrbrdo's changes.