Fixes based on blues source. A.