more fixes for literals