Constify a couple more methods