Closes #662, warnings about const