Minor cleanups
Const-correctness fix to allow temporaries