Some maintenance on admin pages