fixes on overheards