Some bugfixes from site