companion fixes