Fix some more constant handling