Some bug fixes
Update site version