Include fixes and favicon