Quick fix'es found on the site from the last update