Fixes in progress ...