Fine adjustments to cover pic functionality