Fixes to detected issues