Various maintainance and small fixes in content