Reenabled a few more consts