Fixes for the following claims: