Better fixes, reduce StringBuffer
Fix merge issue