Fix known errors from Stackoverflow and users experiences