Fixes found after google crawled