Prepend/append fixes