Fixes to cover interaction