cal fix, admin fix, explorer/upload fix